gnutls: fix compilation on x86-32
authorNikos Mavrogiannopoulos <[email protected]>
Wed, 4 Jun 2014 16:23:02 +0000 (18:23 +0200)
committerNikos Mavrogiannopoulos <[email protected]>
Wed, 4 Jun 2014 16:23:57 +0000 (18:23 +0200)
Signed-off-by: Nikos Mavrogiannopoulos <[email protected]>
libs/gnutls/patches/0001-nn-hash.patch [new file with mode: 0644]

diff --git a/libs/gnutls/patches/0001-nn-hash.patch b/libs/gnutls/patches/0001-nn-hash.patch
new file mode 100644 (file)
index 0000000..948c1f2
--- /dev/null
@@ -0,0 +1,28 @@
+diff --git a/lib/accelerated/x86/x86-common.h b/lib/accelerated/x86/x86-common.h
+index 03fc8de..647c7d6 100644
+--- a/lib/accelerated/x86/x86-common.h
++++ b/lib/accelerated/x86/x86-common.h
+@@ -29,11 +29,13 @@ extern unsigned int _gnutls_x86_cpuid_s[4];
+ void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx,
+                 unsigned int *cx, unsigned int *dx);
+-#ifdef ASM_X86_32
++# ifdef ASM_X86_32
+ unsigned int gnutls_have_cpuid(void);
+-#else
+-#define gnutls_have_cpuid() 1
+-#endif                                /* ASM_X86_32 */
++# else
++#  define gnutls_have_cpuid() 1
++# endif                               /* ASM_X86_32 */
++
++#endif
+ #define NN_HASH(name, update_func, digest_func, NAME) {       \
+  #name,                                               \
+@@ -44,5 +46,3 @@ unsigned int gnutls_have_cpuid(void);
+  (nettle_hash_update_func *) update_func,     \
+  (nettle_hash_digest_func *) digest_func      \
+ } 
+-
+-#endif